Merge tag 'upstream/3.6.1_20160630'
authorGert Wollny <gw.fossdev@gmail.com>
Tue, 11 Oct 2016 20:08:26 +0000 (20:08 +0000)
committerGert Wollny <gw.fossdev@gmail.com>
Tue, 11 Oct 2016 20:08:26 +0000 (20:08 +0000)
commit3e06ce37c3e30eac19e4b0f2939bed3e32eac43f
treee62f52a8354b9b8a254049afa922e0b36396ff6c
parent5d5ea077c326d99aa996705c2427afc742fafea8
parent5dbd33b457ddef47c262ea66ae89c1fc626f8891
Merge tag 'upstream/3.6.1_20160630'

Upstream version 3.6.1~20160630